Handle composed and mixed associated type constraints #108
+76
−9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nolinmcfarland
changed the title
nolinmcfarland
commented
May 16, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #108 +/- ##
==========================================
+ Coverage 68.78% 68.84% +0.06%
==========================================
Files 71 71
Lines 4558 4567 +9
==========================================
+ Hits 3135 3144 +9
Misses 1423 1423 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
nolinmcfarland
commented
May 30, 2025
| for (index, inheritedType) in inheritedTypes.enumerated() { | ||
| inheritedType | ||
| .trimmed | ||
| .with(\.ampersand, index < lastIndex ? .binaryOperator("&") : nil) |
There was a problem hiding this comment.
.binaryOperator("&") is the ampersand token used in Swift Syntax's CompositionTypeElementListSyntax by default.
|
@graycampbell I’ve updated the code to build the inheritance clause using a |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 Summary
This pull request fixes a bug in
MockedMacro.mockGenericParameterClausewhere associated types using composition (&) in their constraints weren’t handled correctly.Previously, the
@Mockedassumed all inherited types wereIdentifierTypeSyntaxnodes, which holds for comma-separated constraints (e.g.Hashable, Sendable). However, composed constraints (e.g.Hashable & Sendable) are represented in the syntax tree asCompositionTypeSyntax, which nests multipleIdentifierTypeSyntaxelements. As a result, these weren’t being parsed, and the generated generic parameter clause was incomplete or incorrect.To fix this, I've:
mockGenericParameterClauseto correctly extract constraints from bothIdentifierTypeSyntaxand nestedCompositionTypeSyntax.🛠️ Type of Change
🧪 How Has This Been Tested?
I've tested the
@Mockedmacro expansion when anassociatedtypehas constraints that are comma-separated, composed, or a mix of both. Please see screenshots of the expansion below.I've also added unit tests to validate these scenarios going forward.
@Mockedexpansion🔗 Related PRs or Issues
✅ Checklist
SwiftFormat